Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 8 Sep 2011 20:21:30 +0000 (13:21 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 8 Sep 2011 20:21:30 +0000 (13:21 -0700)

Trivial merge